From ad87ebb5e708b29ca347167751e8b97948a20d17 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 22 Dec 2015 16:19:18 -0500 Subject: [PATCH] Adwaita: Adapt to previous commit Rename all outline*radius properties to -gtk-outline*radius. --- gtk/theme/Adwaita/_common.scss | 14 +++++++------- gtk/theme/Adwaita/gtk-contained-dark.css | 14 +++++++------- gtk/theme/Adwaita/gtk-contained.css | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index dd0bd360f8..2c9e36f660 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -37,7 +37,7 @@ $asset_suffix: if($variant=='dark', '-dark', ''); outline-style: dashed; outline-offset: -3px; outline-width: 1px; - outline-radius: 2px; + -gtk-outline-radius: 2px; } @@ -2279,11 +2279,11 @@ scale { -GtkRange-trough-border: 2; outline-offset: -10px; - outline-radius: 6px; + -gtk-outline-radius: 6px; &.fine-tune { outline-offset: -8px; - outline-radius: 8px; + -gtk-outline-radius: 8px; trough { margin: 11px; @@ -2911,12 +2911,12 @@ messagedialog { // Message Dialog styling } %last_button { border-bottom-right-radius: 7px; - outline-bottom-right-radius: 5px; + -gtk-outline-bottom-right-radius: 5px; } %first_button { border-left-style: none; border-bottom-left-radius: 7px; - outline-bottom-left-radius: 5px; + -gtk-outline-bottom-left-radius: 5px; } } } @@ -2987,7 +2987,7 @@ placessidebar { padding: 5px; @extend button.flat; border-radius: 100%; - outline-radius: 100%; + -gtk-outline-radius: 100%; &:not(:hover):not(:active) > image, &:backdrop > image { opacity: $_placesidebar_icons_opacity }; } @@ -3440,7 +3440,7 @@ cursor-handle { button.circular { border-radius: 20px; - outline-radius: 20px; + -gtk-outline-radius: 20px; } button.circular label { diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 7a8f790790..45b255accd 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -15,7 +15,7 @@ outline-style: dashed; outline-offset: -3px; outline-width: 1px; - outline-radius: 2px; } + -gtk-outline-radius: 2px; } /*************** * Base States * @@ -3094,10 +3094,10 @@ scale { -GtkRange-slider-width: 26; -GtkRange-trough-border: 2; outline-offset: -10px; - outline-radius: 6px; } + -gtk-outline-radius: 6px; } scale.fine-tune { outline-offset: -8px; - outline-radius: 8px; } + -gtk-outline-radius: 8px; } scale.fine-tune trough { margin: 11px; } scale.fine-tune trough, scale.fine-tune trough fill, scale.fine-tune trough highlight { @@ -4113,11 +4113,11 @@ messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-a border-bottom-style: none; } messagedialog.csd .dialog-action-area button:last-child { border-bottom-right-radius: 7px; - outline-bottom-right-radius: 5px; } + -gtk-outline-bottom-right-radius: 5px; } messagedialog.csd .dialog-action-area button:first-child { border-left-style: none; border-bottom-left-radius: 7px; - outline-bottom-left-radius: 5px; } + -gtk-outline-bottom-left-radius: 5px; } GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #1c1f1f; } @@ -4162,7 +4162,7 @@ placessidebar row { .titlebar button.sidebar-button.titlebutton { padding: 5px; border-radius: 100%; - outline-radius: 100%; } + -gtk-outline-radius: 100%; } button.sidebar-button:not(:hover):not(:active) > image, headerbar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, .titlebar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image, headerbar button.sidebar-button.titlebutton:backdrop > image, .titlebar button.sidebar-button.titlebutton:backdrop > image { @@ -4610,7 +4610,7 @@ cursor-handle { button.circular, headerbar button.circular.titlebutton, .titlebar button.circular.titlebutton { border-radius: 20px; - outline-radius: 20px; } + -gtk-outline-radius: 20px; } button.circular label, .titlebar button.circular.titlebutton label { diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index b259ec62e8..970ac067e6 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -15,7 +15,7 @@ outline-style: dashed; outline-offset: -3px; outline-width: 1px; - outline-radius: 2px; } + -gtk-outline-radius: 2px; } /*************** * Base States * @@ -3256,10 +3256,10 @@ scale { -GtkRange-slider-width: 26; -GtkRange-trough-border: 2; outline-offset: -10px; - outline-radius: 6px; } + -gtk-outline-radius: 6px; } scale.fine-tune { outline-offset: -8px; - outline-radius: 8px; } + -gtk-outline-radius: 8px; } scale.fine-tune trough { margin: 11px; } scale.fine-tune trough, scale.fine-tune trough fill, scale.fine-tune trough highlight { @@ -4285,11 +4285,11 @@ messagedialog.csd .dialog-action-area button, messagedialog.csd .dialog-action-a border-bottom-style: none; } messagedialog.csd .dialog-action-area button:last-child { border-bottom-right-radius: 7px; - outline-bottom-right-radius: 5px; } + -gtk-outline-bottom-right-radius: 5px; } messagedialog.csd .dialog-action-area button:first-child { border-left-style: none; border-bottom-left-radius: 7px; - outline-bottom-left-radius: 5px; } + -gtk-outline-bottom-left-radius: 5px; } GtkFileChooserDialog .dialog-action-box { border-top: 1px solid #9d9d99; } @@ -4334,7 +4334,7 @@ placessidebar row { .titlebar button.sidebar-button.titlebutton { padding: 5px; border-radius: 100%; - outline-radius: 100%; } + -gtk-outline-radius: 100%; } button.sidebar-button:not(:hover):not(:active) > image, headerbar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, .titlebar button.sidebar-button.titlebutton:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image, headerbar button.sidebar-button.titlebutton:backdrop > image, .titlebar button.sidebar-button.titlebutton:backdrop > image { @@ -4783,7 +4783,7 @@ cursor-handle { button.circular, headerbar button.circular.titlebutton, .titlebar button.circular.titlebutton { border-radius: 20px; - outline-radius: 20px; } + -gtk-outline-radius: 20px; } button.circular label, .titlebar button.circular.titlebutton label { -- 2.30.2